Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Thu, 15 Mar 2012 18:35:29 +0000 (11:35 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Thu, 15 Mar 2012 18:35:29 +0000 (11:35 -0700)
commit11f53818302ca5c0e5741b5ddbc3cb840ce9195d
treeb0adf0189f46351bd6e7eae76f964943c4596d28
parent0ceb80d308bfcd34c6350d34b353886bd91abd6f
parentdad125c74e5ffd90b787b6bee39fb4801364bf38
Merge from trunk.